Merge from emacs-23 branch
authorChong Yidong <cyd@stupidchicken.com>
Thu, 7 Jul 2011 16:18:25 +0000 (12:18 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Thu, 7 Jul 2011 16:18:25 +0000 (12:18 -0400)
commit4dc9b26b7ca8b12745819120969523018cd30ad6
treeb3e9d160290f584d3cddd9fd61a4e381046fb93e
parent65f84e9c7a691f0078f480f28eae2413c2f61eae
parentca149f36390ce6cb0073872591fc1b33c3c0d053
Merge from emacs-23 branch
src/ChangeLog
src/composite.c
src/xdisp.c